85e091a44009ac1c5c490eae58fbd886a1214ab4,client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java,PropertiesStrategy,findDocNames,#File#AndFileFilter#,67

Before Change


   public Set<String> findDocNames(File srcDir, AndFileFilter fileFilter) throws IOException
   {
      Set<String> localDocNames = new HashSet<String>();
      NotTargetFileFilter notTargetFilter = new NotTargetFileFilter(opts.getLocales(), ".properties");
      fileFilter.addFileFilter(notTargetFilter);

      Collection<File> files = FileUtils.listFiles(srcDir, fileFilter, TrueFileFilter.TRUE);
      for (File f : files)
      {
         String fileName = f.getPath();
         String baseName = removeDotProperties(fileName);
         String relativeName = PathUtil.getRelativePath(baseName, srcDir.getPath());
         localDocNames.add(relativeName);
      }
      return localDocNames;

After Change


   }

   @Override
   public Set<String> findDocNames(File srcDir, List<String> includes, List<String> excludes) throws IOException
   {
      Set<String> localDocNames = new HashSet<String>();

      includes.add("**/*.properties");
      for (LocaleMapping locMap : opts.getLocales())
      {
         String loc = locMap.getJavaLocale().toLowerCase();
         excludes.add("**/*_" + loc + ".properties");
      }

      DirectoryScanner dirScanner = new DirectoryScanner();
      dirScanner.setBasedir(srcDir);
      dirScanner.setCaseSensitive(false);
      dirScanner.setExcludes((String[]) excludes.toArray(new String[excludes.size()]));
      dirScanner.setIncludes((String[]) includes.toArray(new String[includes.size()]));
      dirScanner.scan();
      String[] files = dirScanner.getIncludedFiles();

      for (String relativeFilePath : files)
      {
         String baseName = FilenameUtils.removeExtension(relativeFilePath);
         localDocNames.add(baseName);
      }
      return localDocNames;